update for new wai stuff