FT Refactor