Ok, will update pull request when ready.