Refining the definitions of gadgets to more closesly follow source paper.