update for 2.5