incorporated Geoff's comments