Started changes to VS2012