improve the demo a bit