update for 2.6