Merging Gloria's edits