Small changes to Demo