Changes in response to Marv's comments in issue #254