In FW build port corrected for 2 tornados