Remove splits and use xml