Handoff *BR: Move to diag