Top end rebuild (XS1B)