Updated to VS 2012 format