~ merge add_controls with controls