Refined demo slightly