Took out check for XTAF that was incorrect