adding better pipeline management