Current control (23/24)

Current control