Align with Jeremy's device-control