Modified version to point to demo server