added Olivia's code