More class 6 updates