add tof and single choice