Current control (10/24)

Current control