Uses a method agreed with Owen after a talk with him.

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>