modified for single server instance