More bits of demo management