Refactored version of the toolbelt