Can you give me a summary of what changed in this file? The order of everything ended up changing, so the diff isn't that helpful.