Preparation for new build