rename and improve demo