#1: Salva's Aug 27 changes

Change request updated