Renamed to emphasize the new, more general approach.
Rethinking approach here...