2006, in Philadelphia, Rave and Alex Shelley of The Embassy attacked ROH World Champion Bryan Danielson after a successful title defense. At Tag Wars 2006, Rave, along with Shelley and Abyss, won the 2006 Trios Tournament. Rave used his title shot earned at the Tag Wars 2006, but came up short in his match with Danielson at the Fourth Anniversary Show. In 2006, Rave had sporadically been tagging with Alex Shelley in search of the ROH Tag Team Titles, but after Shelley left the company in mid-year, Rave returned to singles action briefly. He found himself on the losing side of several encounters with Davey Richards. Soon Nana brought in a new tag partner, Sal Rinauro, and the two began working through the tag ranks. In September 2006, Prince Nana announced his departure from Ring of Honor, ending The Embassy. Jimmy Rave would then go on a losing streak, until he scored a major upset by pinning ROH World Championship number one contender Homicide. The rest of the year and the early part of 2007, Rave feuded with Nigel McGuinness, culminating in a match on March 4, 2007, in Liverpool, England, where McGuinness finally managed to pin Rave in a Fight Without Honor to end the rivalry. Following the match, Rave was temporarily sidelined from in-ring action due to a broken jaw. In storyline the injury was credited with McGuinness hitting him with a lariat, but in reality Rave had broken his jaw a month earlier in a match against Samoa Joe. During his recuperation Rave was prescribed with pain medication, which later led to an addiction. On May 22, 2007, it was announced that Rave had signed a contract with Ring of Honor. On August 2, 2007, however, it was announced that Rave had left both Ring of Honor and Full Impact Pro. Total Nonstop Action Wrestling (2007–2009, 2011, 2013) In August 2007 it was announced that Rave had signed a contract with Total Nonstop Action Wrestling. He returned to the promotion at No Surrender on September 9, 2007, where he appeared alongside Christy Hemme and Lance Hoyt, later known as Lance Rock. The trio was subsequently named the Rock 'n Rave Infection, with Hemme, Rock and Rave adopting the mannerisms of a rock band and carrying Guitar Hero game controllers to the ring. He then became a jobber to the X Division, and the Tag Team division with