changed mod
merged zhiwen