Add auto restart

Can lag at second restart