Updated Project 3