More changes to simple_demo