UPDATE: Refactoring.