review comments from lstrojny added