Gadget rework idea for Griff's second gadget...