reworking the demo
more demo