changed some classes