Completed changes to assigment 1