Final update of the assignment