update for review comments