Improving safety for passengers and drivers