Improve demo