This section needs some manual work. It was inconsistent before, but now it's worse.