Current control (8/24)

Current control