update for 9.4/9.5