changes for phase 2