demo-ready version.