round 6 changes added to other classes