Winay's Tarrif related chanegs

@winay please review your code changes