commit - with old code and new phase 1 code