Improve FHA and FTA