changes after testing on windows