Khalid's changes