NEW YORK (AP) — New York City would stop honoring detainment orders from U.S. immigration officials without a warrant from a federal judge, according to a pair of bills that will be proposed before the City Council next week.

The bills also stipulate that even with a judge’s warrant, the New York Police Department is permitted to detain the subject only if the suspect is convicted of a “violent or serious crime.” Moreover, the city’s Department of Corrections would be forced to curb its enforcement of civil immigration laws, and the U.S. Immigration and Customs Enforcement would be made to close its facility on Riker’s Island, the city’s largest jail.