A bit of re-organisation of responsibilities