Add working code for win32