lots of work on the demo