Updated for Peer Assignment 1