Shared controls (22/24)

Shared controls