Apply changes from Lauren's last comment