Updated to FOPM new version