@maxRicardo  I would go with @ElBrogrammer's suggestion as it immediately resolves the issue form which this pull request originated, however if the re-write adds performance boosts or other improvements, we would want to go with that.