improving FFIP behaviour