[1029695] Refactored