Updated solution to VS 2012