Demos: optimizations