More work on Class 2.