TV refactored