Thank you. Refactored in the refactored branch (no pr yet)