Shared controls (23/24)

Shared controls