final changes to support microsoft proxy