Made TD8 more consistent