Bring back KB demo to a current state