Project 2 fixed