Fixing Roger's comments