Added auto-restart