Strengthening Mental Health Diversion While Protecting Public Safety