Diversion changes
Making diversion work