workable upgrades
merged