Update on Lexer fixed Sultans Issue