Rafael's Changes

Rafael's and My changes conflict fixed.