update/simplify demo