Current control (9/24)

Current control