adding review comments with Tracy's code