Updated pipeline (no clustering)