update to class 6 stuff