fan/current supply refactor