Yet more work on Class 6