update for v2.7