change to new style classes