Yes.
And also, I suggest you replace "Pause timer" with "Remove timer" in event #8 too.
Then you will be able to check if the timer is running by comparing Timer1.ElapsedTime("UpgradeTimer")
If ElapsedTime=0, the timer is not running, if it's >0, then it's running.
You could remove the OnUpgrade variable and all those events where you save/load it to local storage.