Added more to the demo