Phi-related changes -- draft