final set of changes from the windows machine