Address Kha's comments