Continuing to move changes from the main template