Shiny new implementation!
2.0.0