Fixed tools again