shop and other components added