Scanner tab - code optimalization