Include Tao's changes