Final edit of assignment 1