Update for latest chg_traj code.