Improve assignments for class 5