More modifications by Wanzhang Sheng