Added /demo functionality