Gadget and Parsing Changes. Some Gadgets Removed.