More demo generalization