updated windows wrapper