I won't be touching the upgrade system until I'm done with the main story mode. But the suggestion isn't half bad, I'll keep it in mind.
