In a move aimed at improving rider safety and comfort, Uber is testing a new feature that allows women riders to request female drivers, and vice versa. The option, called “Women Rider Preference,” is now available in select U.S. cities including Los Angeles, San Francisco, and Detroit—with potential to expand depending on user demand and driver availability.

The new feature works both ways:

• Women riders can choose to be matched with a female driver when booking a ride.

• Female drivers can opt to receive ride requests only from women.

This added layer of choice is designed to help women feel more secure, especially during nighttime rides or when traveling alone. While the feature doesn’t guarantee a female match every time—only about one in five Uber drivers are women—the company says it should significantly increase the likelihood of such pairings when selected.

Safety concerns have long been a topic in the ride-hailing industry. Uber has faced lawsuits and high-profile reports involving misconduct. By offering gender-based matching, the company hopes to better serve those who may feel more comfortable with a same-gender driver or rider.

The feature is entirely opt-in and doesn’t restrict service for male riders or drivers. Users can switch it on or off depending on their preferences and situation.

Given that only about 20% of Uber drivers nationwide are women, smaller cities and rural regions could face issues like longer wait times or fewer matches if the feature becomes widely available.