#238: Mona's Apr 18 changes

Change request updated 4 months ago