Added class 17