changed class-syntax to new-style