I understand what you say, but if you don't mind I will leave this one to you after the pull request is merged, as you seem to know a lot more about it than me..