Align with spoilers.cu to make diffs closer