Edit Yang's part