Change to classic pipeline