Add Baishen's modification.