Updates for Scanner, Part 2