finish move to new-style objects)