...and replace them with the struct gadgets
...and replace them with the struct gadgets