Current control (21/24)

Current control