FoF updated with OMP and comments