start of fixing windows support