Move ToD before PB and avoid wasting a PB GCD