Updated file following review in github - probably now complete.