Added stuff in the demo