some update for full windows compatibility