Changed to accommodate single server handling