Second commit with changes for windows