changed struct of some classes, added new possibilities