Ajay/Melanie |#3871| Refactoring and adding ft's