Final modifications from assignment.