Added updated scanner routines