Change request #7: Mahammad's Apr 12 changes