Initial commit
Demo code optimized