Continue working on windows