Lokesh|Minor FT refactoring