Added more to simple_demo