RE: Diverting from upstream