class2 overhaul