Improving demo