I won't have time to edit the PR soon, feel free to close the PR and implement with your solution