rejigged GTD stuff to be pulled from gas-gtd pack