Scanner updates

Scanner updates