More demo updates