TVAPPS: Refactored carlos' files