Updated FIP finding
Resolved merge conflict