The search for a man who Tulsa Police say was involved in the death of a nightclub owner is over.

56-year-old Frank Valdes died nearly 3 weeks ago after trying to break up a fight outside his business. Tulsa Police arrested Tiyon Davis Wednesday night and he has been charged with first-degree manslaughter for Frank Valdes' death.

The search for Davis lasted nearly three weeks.

Tulsa Police say Davis and Ramon Garcia-Ibarra got into a fight in the Miami Nights parking lot on October 24th. According to police Valdes tried to break up the fight but the two shoved him to the ground and beat him. Valdes ultimately died of a heart attack. An affidavit says security guards outside the club tried to help Valdes but a car drove toward one of them.

Hours after the attack -police arrested Garcia-Ibarra and Jose Le-des-ma Hernandez who police say hit a security guard with his car. Both Tiyon Davis and Garcia-Ibarra are charged with first-degree manslaughter. Ledesma-Hernandez is charged with assault with a deadly weapon.