I will rework my pull request in a minute.