Pipeline some stuff better