Refactored T