Plan refactored