Updated final version of Project 2