removed geoserver and changed json