Refactored too