More work on demo