Finish assignment, update #6