upgrades are now actor based

this gives us more flexibility
fix failed merge