Current control (7/24)

Current control