Final changes for Assignment 2