Upgrade to use XP 6.0.0 beta 1