There was no real need to change this implementation. We are adding way too much code and way too much complexity.