Improving basic demo