I like this solution of yours, thorough and clean 👍