Current control (4/24)

Current control