pulled changes from svmalik/evergreen and tidy Existing