Updated tools and interface