Add the weird toro stuff.
Some catches for < v10.

Credit to @rmcc