Responded to Shefal and Mahesh comments