#convenience upgrades