The Courts and Collaborative partners have a role in the competency restoration of individuals in custody and ensuring the rights of these individuals. The competency waitlists continue to grow and wait times are excessive, yet there are still actions the jail and courts can take to reduce cost, reduce wait times, and ensure the individual rights. The law now requires a police agency’s good faith effort to divert individuals with mental illness from the jail. It is also necessary to treat those in custody and divert when indicated. Courts have several options for addressing these cases including education of local agencies, fit for confinement on psychiatric emergencies, APOWW/EDO releases from custody, and the team roles in reviewing and referring these Cases. This session reviews options available to the Courts in addressing competency cases and diversion of individuals with mental health needs.