committing phase 2 changes