Integrating modifications from _s.