safer P_ADV.
WIP.