lexer + sample update