update for new event system