Add tools part 2