simplify demo a bit.