some tweak of the demo