#13: Rafael's Oct 22 changes

Change request updated