Added the XTAF check back into the function
Changed the redundant if else statment to a  if(ISFAT OR ISXTAF)