Hijack SPEC changes after review discussion