Updated for VS 2012