Need to expand beyond XPA-5