Added stuff for simplerun from v2.0001 branch