Minor changes made to scanner, still having speed issues.