Current control (11/24)

Current control