Assignment 2 (Final edits)