Added XFT patch