Alerts
Polishing
Refactored tree