Improved

v2 - 2025-11-19