VSTS/Improvements