Prep. work for new LiveTV improvments