This is the new version we're going to use.

Overhaul!