BlueWave Upgrade