V1.1 upgrades