[master] Improve demo