incorporating Geoff\'s comments