further work on demo