Add scanner and matrix