modified and fixed the ff files