working on demo
Merge remote-tracking branch 'remotes/origin/Quick240' into Quick240
demo mode working