Updates based on Jessica's feedback