It make sense.

I'll update code with it.

I'll also have a look at unit tests for it actually