More work on Class 1