FLINT, Mich. (AP) — Drinkable unfiltered tap water for residents in Flint might still be a few years away.

Retired National Guard Brig. Gen. Michael McDaniel, who is heading the pipe replacement program, says he has an optimistic goal of 2019 for all lead piping to be replaced in the neighborhoods.

McDaniel says pipe replacements are expected to pick up in late April. Construction crews are replacing the old lead lines with new copper ones in neighborhoods most affected.

So far, less than 800 homes have been replaced, but an estimated 20,000 lines need to be replaced. The goal will be to target 6,000 homes a year between 10 different zones in the city. Several issues such as inaccurate city records and monetary issues have hindered progression.