making t-f-w-t-n more robust