Refactored 22.