added the fst directive back
Refactoring