Thanks for the feedback and 100% agree on the shield vs repair function. I just added a new build where upgrade no longer repairs the shields!