made some edits for zijian