p_from_z and z_from_p: add two arguments