Update for Project Iteration 2