Project 2 Updated