added/modified some classes