FF changes