updated Chang's part