update for 36 upgrade