Issue874 switch to DPF format

Ian has taken over the branch, just to tidy some text.