more changes to scanner that I don't want to lose