my last commit before phase 2