Refined the demo