simplify the demo a bit