ff refactor completed