modifications because of different versino of Visual Studi