Add Tians code to combined