Added more stuff to demo 2