Converted solution to VS2013