Project 2 fix up