Changes for phase 2