Edf contrib

Some contributions from EDF's CCN HPC
use `goalf` instead?