Updated Assign 1