review comments from @pflynn