switch to new-style classes