phase 1 final changes first commit