Improving home demo