Some changes to demo