[WIP] Use lexer 

to revert this line