Made Gadget-friendlier