I will definitely take a look on the PR. As long as the experience improves, it should be ok to merge.