Work on structure upgrades