Roger: added some things