Changes to Assign 7