dropped redefining of classes (fixes #35)