QA updates part 2