Heri | #3559 | Adding some FTs