Working on Windows version