Updated to the latest version of the FPAI