Simplified overall structure & fixed timeline