All changes for phase 1 pushed