Restructure of the Preparation section