FIX: Amended assignments 3 and 4 from tutor suggestions