Lots of reformat of fiop.r, still the same functions