more azure swap updates