Updates to simple2 demo