many changes - missing speaker template