Pull request for arbitration and anti-arbitration

The title is a little bit arbitrary.