better on restarts