combined some classes