Polishing the demo