Updated demo to use the new subdomains and slim the code