Add more efficient exiting/restart
Updates