Updated for XC5.