updates for review comments