Updated Project 2