Current control (22/24)

Current control