#666 - handle upper-tier tou rates properly