Updated for Windows.