Upgrade to vs 2012