Make it more flexible and work better in Windows.