prelimanary changes for windows port