Thesis: The Tool added