last changes for ff