Redid the Scanner