I use XTOL replenished for both. Do not reduce the rotary processing time.