Adjusted for Visual Studio