why these changes?  Shouldn't be needed.