refactored gadgets.
refactored gadgets.