Preparing for SW Upgrade