complete syntax upgrades