Yes, I think that could be the best solution if the two versions can co-exist.

Will try to do so.

Thank you very much, Emmanuel.
John