Control.g updated for structs