redo demo to simplify