move TCFA after state check, to facilitate easier immediate check