Bring back the XPR and/or XPA-1L