Made the server simpler.