to work nationally instead, joining the world's oldest professional wrestling promotion as part of CMLL's rebuilding after a split that led to the creation of Asistencia Asesoría y Administración (AAA). He was put over veteran rudos like Bestia Salvaje and Satánico in hair matches and Garza quickly became one of the top técnicos in the company. In the following year, he teamed with Dos Caras and La Fiera to win the CMLL World Trios Championship, and lost to Emilio Charles Jr. in the final of the La Copa Junior, a tournament for second-generation wrestlers. AAA / World Wrestling Federation (1996–1997) When Garza joined AAA, he was also able to work for the US-based World Wrestling Federation (WWF) through AAA's working agreement. His first televised WWF appearance saw him defeat T.L. Hopper on an episode of Superstars. At the 1997 Royal Rumble pay-per-view show Garza teamed up with El Canek and Perro Aguayo to defeat Fuerza Guerrera, Heavy Metal and Jerry Estrada. He worked several more matches for the WWF, with his last appearance for the company taking place on March 10, 1997 where he, Latin Lover and Octagón lost to Pentagón, Heavy Metal and Pierroth on the 200th episode of Monday Night Raw. In AAA he often worked as part of a trio known as La Maquina del Amor ("The Love Machine") alongside Heavy Metal and Latin Lover, a group of young, good looking, fan favorites that were very popular with the female fans. All three members of La Maquina del Amor qualified for the 1997 Rey de Reyes tournament along with Octagón, which Latin Lover won. Later that year Garza teamed up with Super Nova for the "Young Stars" tag team tournament. In the first round the duo defeated May Flowers and Pentagón, but lost to Fuerza Guerra and Mosco de la Merced in the semi-finals. World Championship Wrestling Cruiserweight division (1997–1998) The AAA/WWF collaboration ended in mid-1997, which led to many AAA workers wrestling for WWF's rival, World Championship Wrestling (WCW), later in the year. Garza made his WCW debut on May 20 by defeating Psychosis at a live event. He made his televised debut in WCW on the May 26 episode of Monday Nitro by teaming with Juventud Guerrera and Super Calo to defeat Ciclope, Damien and La Parka in a six-man tag team match. His first televised singles match in WCW took place on the June