Improving experience for heavy current conditions, #199