update for latest tools