Address vinod's comments