altered some classes