Add Pao's Last Changes