more copypaste to fix class files