major updates to scanner