might be nice to have this formatted a bit more (if that's possible?) for diff-readability.