Merging Carl's Changes