Added review comments part 2