The restart was moved just below the stop now, which could cause
potential issues.  Need to be careful now...