changed class names etc.