#26 changed classes

#26 changed classes