FinalUpdateForTFA

complete functionalty