update for master (2.2.beta) use