Current control (15/24)

Current control