In December 2006, Yang became the number one contender for the Cruiserweight Championship. Yang challenged Gregory Helms for the Cruiserweight title, but lost to him at Armageddon. Later, he participated in a Cruiserweight Open at No Way Out for the Cruiserweight Title, but was unable to win the title. In mid-2007, Yang and Chavo Guerrero began a feud. On the June 15 edition of "SmackDown!", Yang once again became the number one contender for the Cruiserweight Championship, after feuding with Guerrero for almost two months. At , Yang lost to Guerrero after a frog splash. During The Great American Bash, Yang competed in another Cruiserweight Open and although he was never pinned, Hornswoggle won the title after becoming an official entrant in the match due to him hiding under the ring. On the July 27 edition of "SmackDown!", Yang teamed with Torrie Wilson against Kenny Dykstra and Victoria; Yang and Wilson won the match after Yang pinned Dykstra. Following this match, Wilson began appearing as Yang's new valet.