added windows support without conflicting