updated some classes