Improving server demo