modified some classes