changes from VS