Minor Changes to Demo