Try to make more Windows friendly