Current control (12/24)

Current control