Simplified the workflow a bit.