review feedback from Shirish