#27: NFsTay's Oct 7 changes

Change request updated