Current control (18/24)

Current control