Updated Tools for Windows