I'm not sure I understand the need for this change? (In any case should be done centrally)