Roger: tweaked some things