review comments updated

Dan's review comments updated