More

    improve productivity on Windows