Improved display and fallback logic
Consolidating tools