Current control (6/24)

Current control