I post a comment in @alda519 -s PR. please review. I believe it's done here right the same you liked.