Update based on Ivonne's QA