Upgraded XAP3 to XPA7