more changes, added new ServerNoPool version