review comments are fixed