Improve demo
Better demo