Begin working on updated tools