This is a great example where this upgrade rules is becoming more like a mess and burden. I am tempted to just remove it here.