Feature/496 tfa restoration

Close #496