Address vinod's comments
Address dominic's comments