Reorganized motion correction.