Forgot to make the handlers conditional on the restart option