yet more work on demos