updates per discussions on the march 7 call
removed server