Improve ff