latest changes are now compatible with visual studio