Updated for VS2012