better server handling