Improving demo examples