moving some things around to hit riot less