Current control (20/24)

Current control