enhance demo, add graphs