Update workflow based on feedback from G. Germain