Updated
Updated TvRule

Cleaned up some code and removed call to universal module.