add DemoRestarter and update modelGenerator (still need some tests)