Improved ClipSizeUpgrade