Final Changes (updated after lab grading)