[#59066796] Refactored