Making it more compatible with Windows