Improved server demo