review comments from dmitriy