Reworking Project 2