Demo-ready commit