Refactored...