Making it workable on windows machine