changes by Wenjia