Diverting from upstream