Small mods to this section (finally)!