Adaptation eipp for OF

Minor changes
Test of eipp data and OF

Does not run at that point....