merge OFTN version