Improved weapon upgrading