updated vs2012 solution