Corrected pipeline stuff