[gtp] Second revision of GTP draft