updated demo, simplified