More work on Class 6