Updated tools