are these changes needed to make this pass?  if not, please revert..