improvement to FF