Experimental upgrade limit

Still needs a new way to implement individual limits