Yin Zheng's changes for Guillimin