Upgrade underscore
Tweak