#1: nojrolnurjol's Dec 11 changes

Change request updated