#161: Roo's Jun 6 changes

Change request updated