Final changes for assignment.