Updated scanner