Refinements to the demo