LL 29/5/17
JG added DOI 21/8/17