added Yang's part