Windows version refactored