updated with current gato server