Fixing Project 2