Merged with YJ's part