Updating to use with Visual Studio