LOT more code upgrades