@stdweird that can be aranged...

it is not doing so now, so let's not worry about it until it does, we can then refactor if needed.