Merge Khalid's changes.