Working on windows again