Trying to nudge the master files closer to Tim's version without breaking anything.