XPA-3 & XPA-2 Upgrade