improve demo loading