udpates to class 17