Improve and simplify the demo