Tao's modifications
Merging with Tao's Changes