addressed review comments r/3348