fixed up class 20