Small refactoring + make Demo3 more interesting + new example