Final commit pre-demo