Initial working config and upgrades