Overhaul in a couple of the GDT mechanics.