VS - added some stuffs