Tweak to class 6 exercises