Updated for XC6