More edits for modified pipeline with annotation stage.