Applied changes made by Wangfan Fu