Parts change and layout adapted