More updates based on Karina and Karla's feedback.