Added Geoff's comments