Updated Tools