Demo updates for further simplification