add modificztions for windows