additional work on demo