Swap + upgrade hack