Refactored, kiss.