Refactored 61.