Updated scanner.l