#108: Max's Nov 6 changes

Change request updated