slightly modify public server