Merging Olivia's updates