Updated Project 4