update for new classes