Pulled out token for merged functions.
Adjustments to focusPD.