Project 4 Final changes