Updated exam 2 (almost finished)