small temporary changes to scanner