Added tool and renamed appropriately