Refactored the FF