EMI: address review comment
EMI: address review comment
EMI: address review comment