Improve comp_current.py