more ff1 changes, started ff5