More changes to the small classes post