Denver Mayor Mike Johnston proposed a contract with a new provider of license plate-reading cameras on Tuesday, saying it will come with added precautions as the city ends its controversial arrangement with Flock Safety.

After facing months of public criticism over the city’s relationship with Flock, the mayor’s office is proposing a new contract with Axon, which already provides other technology for the Denver Police Department.

Over the past year, hundreds of Denverites had criticized Johnston for repeatedly extending the city’s contract with Flock despite reports that U.S. Immigration and Customs Enforcement agents had used Flock’s database to aid in President Donald Trump’s mass-deportation campaign.

The company has also faced scrutiny of its nationwide camera system, which many critics say is essentially a mass-surveillance network ripe for abuse.