updated demo with context