Restructured for easier workflow.