Diversion control