First attempt at fixes for TVRC, need to save intermediate efforts