In a move that community leaders say "should lead to better treatment of all Portlanders," a judge signed off Friday on an long-awaited agreement between the federal government and the city that seeks to improve the sometimes violent encounters between police and people with mental illness.

The settlement approved by U.S. District Judge Michael Simon calls for a long list of changes in police policies, training and oversight. Among the reforms: more clear-cut policies about when officers can use deadly force, a push for greater diversity in police hiring, an expansion of the city's mobile crisis units and quicker investigations into officer misconduct, the Oregonian reports.

A key part of the judge's approval: The city must give him annual updates of its progress in carrying out the reforms, which could take as long as five years. The city and police union had objected to the annual check-ins, but a community group said they were necessary to hold the city and police accountable.

The judge also ordered the city or its new compliance officer to give him quarterly reports.