More work on pipeline figure