Nearly finished with pipeline updates