Olivia's changes