NEW VERSION FOR XF