Updates for the third step in the class project