Demoserver code added