Changes for classes 3 & 4.