More simple_demo changes