Updated for VS 2013.