Revert "Revert "ff""

This reverts commit 83ffd5ff2e7c8429f301137e8f1c1b237e68caae.
new master test