scanner/parser update