Added riot into the mix