R4R: Upgrade Tweaks