ffip enhancements