New plan includes return of manned trash sites