improved server.pp