Pooja/Melanie | #0000 |Fixing fts