2 edits to scanner and use cases