Shifting finished, distance correction is theoretically finished