Scanner update 2

Scanner update 2