Upgraded UPR for windows