Redo demo with border