Roger: made a few changes