Improve assignments for class 6