changed to new-style class