Improve demonstration.