incorporate review comments from Chris Bowers