Split plan into three stages for consistency