working on the demo