Improve demo performance