No, replace your entire IF block with what is shown from Select Case and End Select inclusive.
Please use code tags for anything much beyond a few lines to make code easier to read. See Ranman256's code section - hope you agree it's easier to read. Plus, forum inserts a space at 50 characters, which can make your code look like it has errors. Is Option Explicit at the top of each of your code modules? If not, suggest you turn on "require variable declaration" or Google this to learn about why.
The more we hear silence, the more we begin to think about our value in this universe.
Paraphrase of Professor Brian Cox.