CHICAGO (AP) — Chicago Mayor Rahm Emanuel is expected to outline his plan to overhaul the city agency that investigates police misconduct.

The Chicago Tribune reports that members of the Chicago City Council were told Emanuel will introduce the measure Tuesday and hopes for a vote in two weeks.

The mayor’s plan comes as the city deals with the aftermath of a white Chicago police officer fatally shooting a black teenager 16 times in 2014. Officer Jason Van Dyke has pleaded not guilty to murder charges in Laquan McDonald’s death.

The new agency would be called the Civilian Office on Police Accountability. Alderman Scott Waguespack tells the Chicago Sun-Times that he’s generally pleased with the draft ordinance but there are several points of contention.