Quick do update for new API