Just moved this a couple of lines higher up, so that all of the `add_*` lines are together.