IMPROVED FOR 2025