Change request #238: Mona's Apr 18 changes