The light turns green and you accelerate, only to slam on the brakes a block later for a red light. We’ve all been there—the maddening frustration that can be the seemingly horrid timing of D.C.’s traffic signals.

Luckily, that’s about to change. The District Department of Transportation announced today that will retime a whole bunch of traffic signals—at 650 intersections—throughout D.C.

In a statement, DDOT says “this project seeks to improve traffic flow, optimize pedestrian crossing times and reduce transit running times,” which roughly means no more of the frustrating stop-and-go timing of many District traffic lights, especially during rush hour. The citywide push to optimize D.C.’s traffic signals started in 2012, and by the end of 2016, more than 1,650 traffic signals will, in theory, be in sync with each other.

Signal optimization will begin Friday last throughout May. It’ll focus on areas in downtown D.C., from 23rd Street NW to the west, to North Capitol Street in the east; U Street/Florida Avenue NW to the north; and I-395 to the south. Additionally, a few intersections in Georgetown near the M Street NW/Wisconsin Avenue intersection will be adjusted.