Further work on demo