[Wen Hao] - updated join part.