Did some refactoring :) thanks for noticing ... It's now far more efficient from a small test I've did