shuffle to hopefully cleanup diff