#26 classes changed

#6