VID-1784 Responded to some comments