Temporary working version on windows