Major update of demo.mkd