update Control functions to use structs