first commit of phase two