OK thx @evyatron , i will refactor that tomorrow :rocket: