Re-added pipeline figure + some re-structuring