Tweak class 7 exercises