various changes for win