Sept 27th EOD changes

please have a look for the EOD changes.