Testing new scanner code