rework for tools bundle