Critical changes to xf list