adding all phase_0_unit_1 changes