More demo changes