updated demo
(cherry picked from commit c73544f)