Upgrades to functionality