I'll think better about this and do some tests with this branch.

Thank you for working on this :heart: